src/libotutil/ot-variant-utils.h \
src/libotutil/ot-gio-utils.c \
src/libotutil/ot-gio-utils.h \
- src/libotutil/ot-glib-compat.c \
- src/libotutil/ot-glib-compat.h \
src/libotutil/otutil.c \
src/libotutil/otutil.h \
$(NULL)
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AM_CPPFLAGS = -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"' \
- -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_28 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_28
+ -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_34 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_34
AM_CFLAGS = $(WARN_CFLAGS)
if BUILD_EMBEDDED_DEPENDENCIES
echo "NOTICE: Embedded dependencies (GLib and libsoup) enabled"
with_soup=yes
else
- GIO_DEPENDENCY="gio-unix-2.0 >= 2.28"
+ GIO_DEPENDENCY="gio-unix-2.0 >= 2.33.4"
PKG_CHECK_MODULES(OT_DEP_GIO_UNIX, $GIO_DEPENDENCY)
SOUP_DEPENDENCY="libsoup-2.4 >= 2.39.1"
ot_clear_ptrarray (&self->cached_content_indexes);
g_hash_table_destroy (self->cached_pack_index_mappings);
g_hash_table_destroy (self->cached_pack_data_mappings);
- ot_mutex_free (self->cache_lock);
+ g_mutex_clear (&self->cache_lock);
G_OBJECT_CLASS (ostree_repo_parent_class)->finalize (object);
}
static void
ostree_repo_init (OstreeRepo *self)
{
- ot_mutex_init (self->cache_lock);
+ g_mutex_init (&self->cache_lock);
self->cached_pack_index_mappings = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free,
(GDestroyNotify)g_variant_unref);
ot_lptrarray GPtrArray *ret_meta_indexes = NULL;
ot_lptrarray GPtrArray *ret_data_indexes = NULL;
- ot_mutex_lock (self->cache_lock);
+ g_mutex_lock (&self->cache_lock);
if (self->cached_meta_indexes)
{
ret_meta_indexes = g_ptr_array_ref (self->cached_meta_indexes);
ot_transfer_out_value (out_meta_indexes, &ret_meta_indexes);
ot_transfer_out_value (out_data_indexes, &ret_data_indexes);
out:
- ot_mutex_unlock (self->cache_lock);
+ g_mutex_unlock (&self->cache_lock);
return ret;
}
ot_lvariant GVariant *ret_variant = NULL;
ot_lobj GFile *path = NULL;
- ot_mutex_lock (self->cache_lock);
+ g_mutex_lock (&self->cache_lock);
ret_variant = g_hash_table_lookup (self->cached_pack_index_mappings, pack_checksum);
if (ret_variant)
ret = TRUE;
ot_transfer_out_value (out_variant, &ret_variant);
out:
- ot_mutex_unlock (self->cache_lock);
+ g_mutex_unlock (&self->cache_lock);
return ret;
}
GMappedFile *map = NULL;
ot_lobj GFile *path = NULL;
- ot_mutex_lock (self->cache_lock);
+ g_mutex_lock (&self->cache_lock);
map = g_hash_table_lookup (self->cached_pack_data_mappings, pack_checksum);
if (map == NULL)
if (out_len)
*out_len = ret_len;
out:
- ot_mutex_unlock (self->cache_lock);
+ g_mutex_unlock (&self->cache_lock);
return ret;
}
+++ /dev/null
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
- *
- * Copyright (C) 2011 Colin Walters <walters@verbum.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Colin Walters <walters@verbum.org>
- */
-
-#include "config.h"
-
-#include <gio/gio.h>
-
-#include <string.h>
-
-#include "otutil.h"
-
-#if GLIB_CHECK_VERSION(2,32,0) && !defined(OSTREE_GLIB_TARGET_MIN)
-/* nothing */
-#else
-/* Code copied from glib/glib/genviron.c */
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 1995-1998 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GLib Team and others 1997-2000. See the AUTHORS
- * file for a list of people on the GLib Team. See the ChangeLog
- * files for a list of changes. These files are distributed with
- * GLib at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-static gint
-ot_g_environ_find (gchar **envp,
- const gchar *variable)
-{
- gint len, i;
-
- len = strlen (variable);
-
- for (i = 0; envp[i]; i++)
- {
- if (strncmp (envp[i], variable, len) == 0 &&
- envp[i][len] == '=')
- return i;
- }
-
- return -1;
-}
-
-const gchar *
-ot_g_environ_getenv (gchar **envp,
- const gchar *variable)
-{
- gint index;
-
- g_return_val_if_fail (envp != NULL, NULL);
- g_return_val_if_fail (variable != NULL, NULL);
-
- index = ot_g_environ_find (envp, variable);
- if (index != -1)
- return envp[index] + strlen (variable) + 1;
- else
- return NULL;
-}
-
-gchar **
-ot_g_environ_setenv (gchar **envp,
- const gchar *variable,
- const gchar *value,
- gboolean overwrite)
-{
- gint index;
-
- g_return_val_if_fail (envp != NULL, NULL);
- g_return_val_if_fail (variable != NULL, NULL);
- g_return_val_if_fail (strchr (variable, '=') == NULL, NULL);
-
- index = ot_g_environ_find (envp, variable);
- if (index != -1)
- {
- if (overwrite)
- {
- g_free (envp[index]);
- envp[index] = g_strdup_printf ("%s=%s", variable, value);
- }
- }
- else
- {
- gint length;
-
- length = g_strv_length (envp);
- envp = g_renew (gchar *, envp, length + 2);
- envp[length] = g_strdup_printf ("%s=%s", variable, value);
- envp[length + 1] = NULL;
- }
-
- return envp;
-}
-
-gchar **
-ot_g_environ_unsetenv (gchar **envp,
- const gchar *variable)
-{
- gint len;
- gchar **e, **f;
-
- g_return_val_if_fail (envp != NULL, NULL);
- g_return_val_if_fail (variable != NULL, NULL);
- g_return_val_if_fail (strchr (variable, '=') == NULL, NULL);
-
- len = strlen (variable);
-
- /* Note that we remove *all* environment entries for
- * the variable name, not just the first.
- */
- e = f = envp;
- while (*e != NULL)
- {
- if (strncmp (*e, variable, len) != 0 || (*e)[len] != '=')
- {
- *f = *e;
- f++;
- }
- e++;
- }
- *f = NULL;
-
- return envp;
-}
-
-#endif
+++ /dev/null
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*-
- *
- * Copyright (C) 2011 Colin Walters <walters@verbum.org>.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Colin Walters <walters@verbum.org>
- */
-
-#ifndef __OSTREE_GLIB_COMPAT_H__
-#define __OSTREE_GLIB_COMPAT_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#if GLIB_CHECK_VERSION(2,32,0) && !defined(OSTREE_GLIB_TARGET_MIN)
-#define ot_g_environ_getenv g_environ_getenv
-#define ot_g_environ_setenv g_environ_setenv
-#define ot_g_environ_unsetenv g_environ_unsetenv
-
-#define ot_mutex_init(v) do { g_mutex_init (&(v)); } while (0);
-#define ot_mutex_free(v) do { g_mutex_clear (&(v)); } while (0);
-#define ot_mutex_lock(v) do { g_mutex_lock (&(v)); } while (0);
-#define ot_mutex_unlock(v) do { g_mutex_unlock (&(v)); } while (0);
-
-#else
-const gchar *
-ot_g_environ_getenv (gchar **envp,
- const gchar *variable);
-
-gchar **
-ot_g_environ_setenv (gchar **envp,
- const gchar *variable,
- const gchar *value,
- gboolean overwrite);
-
-gchar **
-ot_g_environ_unsetenv (gchar **envp,
- const gchar *variable);
-
-#define ot_mutex_init(v) do { v = g_mutex_new (); } while (0);
-#define ot_mutex_free(v) do { g_mutex_free (v); } while (0);
-#define ot_mutex_lock(v) do { g_mutex_lock (v); } while (0);
-#define ot_mutex_unlock(v) do { g_mutex_unlock (v); } while (0);
-#endif
-
-
-G_END_DECLS
-
-#endif
#include <ot-local-alloc.h>
#include <ot-gio-utils.h>
-#include <ot-glib-compat.h>
#include <ot-opt-utils.h>
#include <ot-unix-utils.h>
#include <ot-variant-utils.h>
projects / ostree.git / commitdiff